bitkeeper revision 1.1159.217.7 (41e40a8a8w0kvbUwccr9zxqfoY0sLQ)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 11 Jan 2005 17:19:06 +0000 (17:19 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 11 Jan 2005 17:19:06 +0000 (17:19 +0000)
commit8e537ab7c94e9eaf7755c990292b6ba4b1bbf00e
tree8809a15e38837f70d137c8a232c953546790ae6b
parentde383efa8a1e1ec610642ad85b4dd1e2877af61f
parentd51faf6cce847264793c49d0da9c2c715d7086d7
bitkeeper revision 1.1159.217.7 (41e40a8a8w0kvbUwccr9zxqfoY0sLQ)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk